auto merge of #528 : alexcrichton/cargo/deadlock, r=brson
authorbors <bors@rust-lang.org>
Tue, 9 Sep 2014 02:13:47 +0000 (02:13 +0000)
committerbors <bors@rust-lang.org>
Tue, 9 Sep 2014 02:13:47 +0000 (02:13 +0000)
1  2 
src/cargo/ops/cargo_rustc/mod.rs
tests/test_cargo_compile.rs

Simple merge
Simple merge